bitkeeper revision 1.1159.1.100 (412b18a1W1qiW0mmY-hZTqXUTc-uLw)

Force inlining on some functions that are designed to compile away.

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 82e28a36525594d6aa21866543a9fc693c3bceb1..fb81d871d024f3896c8fbcf8052ae22eadf80b92 100644 (file)
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -19,6 +19,7 @@ iap10@striker.cl.cam.ac.uk
 iap10@tetris.cl.cam.ac.uk
 jws22@gauntlet.cl.cam.ac.uk
 jws@cairnwell.research
+kaf24@freefall.cl.cam.ac.uk
 kaf24@labyrinth.cl.cam.ac.uk
 kaf24@plym.cl.cam.ac.uk
 kaf24@scramble.cl.cam.ac.uk

diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h
index a16b5c47e57a8575e02dd88248f03ee57fae2c78..9a26e29f080b1c8d0b07bd6f50a61086a8b98a9c 100644 (file)
--- a/xen/include/asm-x86/mm.h
+++ b/xen/include/asm-x86/mm.h
@@ -364,7 +364,9 @@ void ptwr_reconnect_disconnected(unsigned long addr);
 void ptwr_flush_inactive(void);
 int ptwr_do_page_fault(unsigned long);
 
-static inline void __cleanup_writable_pagetable(const int what)
+static always_inline void 
+__cleanup_writable_pagetable(
+    const int what)
 {
     int cpu = smp_processor_id();
 
@@ -376,7 +378,9 @@ static inline void __cleanup_writable_pagetable(const int what)
             ptwr_flush_inactive();
 }
 
-static inline void cleanup_writable_pagetable(struct domain *d, const int what)
+static always_inline void
+cleanup_writable_pagetable(
+    struct domain *d, const int what)
 {
     if ( unlikely(VM_ASSIST(d, VMASST_TYPE_writable_pagetables)) )
         __cleanup_writable_pagetable(what);

diff --git a/xen/include/asm-x86/x86_32/uaccess.h b/xen/include/asm-x86/x86_32/uaccess.h
index cba6b7e3cfff76a7a135ec4e2b2251da5f879a6a..776639782c50e1b2c01ccc7dc0905dbd85a377f4 100644 (file)
--- a/xen/include/asm-x86/x86_32/uaccess.h
+++ b/xen/include/asm-x86/x86_32/uaccess.h
@@ -331,7 +331,7 @@ unsigned long __copy_from_user_ll(void *to, const void __user *from, unsigned lo
  * Returns number of bytes that could not be copied.
  * On success, this will be zero.
  */
-static inline unsigned long
+static always_inline unsigned long
 __copy_to_user(void __user *to, const void *from, unsigned long n)
 {
        if (__builtin_constant_p(n)) {
@@ -369,7 +369,7 @@ __copy_to_user(void __user *to, const void *from, unsigned long n)
  * If some data could not be copied, this function will pad the copied
  * data to the requested size using zero bytes.
  */
-static inline unsigned long
+static always_inline unsigned long
 __copy_from_user(void *to, const void __user *from, unsigned long n)
 {
        if (__builtin_constant_p(n)) {

diff --git a/xen/include/asm-x86/x86_64/uaccess.h b/xen/include/asm-x86/x86_64/uaccess.h
index ba3d49d8a888a73cdf5e4d2a187a0c75b4623dc3..29522716d58637c1340bd6eaac85d91a239f344a 100644 (file)
--- a/xen/include/asm-x86/x86_64/uaccess.h
+++ b/xen/include/asm-x86/x86_64/uaccess.h
@@ -243,7 +243,7 @@ extern unsigned long copy_to_user(void __user *to, const void *from, unsigned le
 extern unsigned long copy_from_user(void *to, const void __user *from, unsigned len); 
 extern unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len); 
 
-static inline int __copy_from_user(void *dst, const void __user *src, unsigned size) 
+static always_inline int __copy_from_user(void *dst, const void __user *src, unsigned size) 
 { 
        int ret = 0;
        if (!__builtin_constant_p(size))
@@ -272,7 +272,7 @@ static inline int __copy_from_user(void *dst, const void __user *src, unsigned s
        }
 }      
 
-static inline int __copy_to_user(void __user *dst, const void *src, unsigned size) 
+static always_inline int __copy_to_user(void __user *dst, const void *src, unsigned size) 
 { 
        int ret = 0;
        if (!__builtin_constant_p(size))
@@ -304,7 +304,7 @@ static inline int __copy_to_user(void __user *dst, const void *src, unsigned siz
 }      
 
 
-static inline int __copy_in_user(void __user *dst, const void __user *src, unsigned size) 
+static always_inline int __copy_in_user(void __user *dst, const void __user *src, unsigned size) 
 { 
        int ret = 0;
        if (!__builtin_constant_p(size))

diff --git a/xen/include/xen/config.h b/xen/include/xen/config.h
index b90544d1167c885083d58fea02ead558e96e8627..95101174babb3b6154f4ef7d8cb2be3a56212d02 100644 (file)
--- a/xen/include/xen/config.h
+++ b/xen/include/xen/config.h
@@ -13,6 +13,8 @@
 #define offsetof(_p,_f) ((unsigned long)&(((_p *)0)->_f))
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 
+#define always_inline __inline__ __attribute__ ((always_inline))
+
 /* syslog levels ==> nothing! */
 #define KERN_NOTICE  ""
 #define KERN_WARNING ""